merge trunk
authorKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 00:23:02 +0000 (09:23 +0900)
committerKenichi Handa <handa@etlken>
Mon, 26 Apr 2010 00:23:02 +0000 (09:23 +0900)

Trivial merge